... so it builds again and also add a note to the xen elf header

that this kernel should be booted in shadow-translated mode.

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
index b440104ff3791567ba6a9e811775de523480ffe3..d68beee323b1b74a6e27e7426ae7872067e88ec8 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
@@ -9,6 +9,9 @@
        .ascii  ",PAE=yes"
 #else
        .ascii  ",PAE=no"
+#endif
+#ifdef CONFIG_XEN_SHADOW_MODE
+       .ascii  ",SHADOW=translate"
 #endif
        .ascii  ",LOADER=generic"
        .byte   0

diff --git a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
index 0301a3cf48b203bb0a95798d6de131549364f73b..8a61a2113cd3a30bc0ba672c63b49607cfc84384 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
@@ -97,8 +97,8 @@ void xen_pmd_unpin(unsigned long ptr); /* x86_64 only */
 void xen_pte_pin(unsigned long ptr);
 void xen_pte_unpin(unsigned long ptr);
 #else
-#define xen_l1_entry_update(_p, _v) set_pte((_p), (pte_t){(_v)})
-#define xen_l2_entry_update(_p, _v) set_pgd((_p), (pgd_t){(_v)})
+#define xen_l1_entry_update(_p, _v) set_pte((_p), (_v))
+#define xen_l2_entry_update(_p, _v) set_pgd((_p), (_v))
 #define xen_pgd_pin(_p)   ((void)0)
 #define xen_pgd_unpin(_p) ((void)0)
 #define xen_pte_pin(_p)   ((void)0)